From db3a615c3149f260749e7f711604feefcbbf08c8 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 20 Mar 2006 18:25:01 +0100 Subject: [PATCH] Fix Xen target image dependencies. Signed-off-by: Keir Fraser --- xen/Makefile | 2 ++ xen/arch/x86/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index dc381ab2e9..487cc0d85c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -55,12 +55,14 @@ $(TARGET): delete-unfresh-files [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s $(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h +ifneq ($(TARGET_ARCH),x86) $(MAKE) -C common $(MAKE) -C drivers ifeq ($(ACM_SECURITY),y) $(MAKE) -C acm endif $(MAKE) -C arch/$(TARGET_ARCH) +endif $(MAKE) -C arch/$(TARGET_ARCH) $(TARGET) # drivers/char/console.o contains static banner/compile info. Blow it away. diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 429cec1b69..014e5f31d8 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -55,7 +55,7 @@ $(TARGET): $(TARGET)-syms boot/mkelf32 ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ `$(NM) $(TARGET)-syms | sort | tail -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` -$(TARGET)-syms: boot/$(TARGET_SUBARCH).o xen.lds +$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds $(LD) $(LDFLAGS) -T xen.lds -N \ boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@ $(NM) -n $@ | $(BASEDIR)/tools/symbols >$(BASEDIR)/xen-syms.S -- 2.30.2